tests: skip tests using gjs/parallel if they are not installed
authorGiuseppe Scrivano <gscrivan@redhat.com>
Wed, 5 Aug 2015 14:51:30 +0000 (16:51 +0200)
committerColin Walters <walters@verbum.org>
Wed, 5 Aug 2015 14:58:00 +0000 (10:58 -0400)
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Closes #131

tests/test-admin-locking.sh
tests/test-pull-corruption.sh

index b82fd5c3a5ef56da907820103c5dec34d7b0de4e..6b4322029a85c819b7e57746a5dbdbc8377e1ef4 100644 (file)
@@ -40,6 +40,9 @@ echo "rev=${rev}"
 ${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime
 assert_has_dir sysroot/boot/ostree/testos-${bootcsum}
 
+# If parallel is not installed, skip the test
+parallel --help >/dev/null 2>&1 || exit 77
+
 parallel_cmd=parallel
 if parallel --help | grep -q -e --no-notice; then
     parallel_cmd="${parallel_cmd} --no-notice"
index 7e4055c1a08f0fc42c75c330a6ddb030ebe5ea72..e81e422969c7b47a5d8fe6a36e1ca95bb9cf7fa7 100755 (executable)
@@ -47,6 +47,9 @@ do_corrupt_pull_test() {
     fi
 }
 
+# If gjs is not installed, skip the test
+gjs --help >/dev/null 2>&1 || exit 77
+
 # FIXME - ignore errors here since gjs in RHEL7 has the final
 # unrooting bug
 gjs $(dirname $0)/corrupt-repo-ref.js ${repopath} main || true